Fix shit
Merge branch 'master' of https://github.com/Ometria/retail_week_hackathon_2014
Merge branch 'master' of https://github.com/Ometria/retail_week_hackathon_2014