Morgan Fainberg 12ab596539 Merge branch 'jamielennox-readme' ...

Conflicts:
	README.rst

2016-01-13 17:21:27 -08:00

..

api

Stop ignoring doc/source/api

2016-01-13 17:03:49 -08:00

conf.py

Add Sphinx Documentation

2016-01-13 16:32:15 -08:00

history.rst

Add Sphinx Documentation

2016-01-13 16:32:15 -08:00

index.rst

Merge branch 'jamielennox-readme'

2016-01-13 17:21:27 -08:00