docs
work on docstring and documentation
merge in master
added docs
new docs built
changed makefile
Merge pull request #97 from rmcgibbo/docs2

Docs