Added documentation along with minor bug fixes
Merge branch 'master' of https://github.com/480Oswego2013/CSC-HCI-480-2013-repo.git