committing code and doc
committing again with full name
Merge pull request #63 from lifeonhoth/master

Fletcher Bach - pull my assignment plz