minor changes to the comments
merging techdivision
resolve conflicts
added basic documentation
Merge pull request #7 from wick-ed/master

added basic documentation