First workable version
Merge branch 'master' of https://github.com/asinha1/MHacks-2013