tons of updates
Final, submitted code for hackathon
Merge branch 'master' of github.com:knksmith57/imo_hackathon

merging temp updates from evan with final changes from my local machine