Added about page
Main functionality now supported
Merge branch 'master' of https://github.com/rhavens/hackathon
Cleaning up directory