Initial
Merge branch 'master' of https://github.com/jacgoudsmit/HackPHX2014Team3