almost done
Merge branch 'master' of https://github.com/lemtzas/TCSS372Wi2013-Project.git