Fix stuff
Merge branch 'master' of github.com:reubent/edqhackday2014