added some stuff dont really remember went to buy orange juice
erge branch 'master' of https://github.com/gcella/Hackathon-Fall-2014