models views and controllers
gerge branch 'master' of https://github.com/gcella/Hackathon-Fall-2014