Pre-merge commit
Merge branch 'master' of github.com:isaacwhite/hackday2013