Prepping the refactor, yo.
Merge branch 'master' of https://github.com/depstein/ggj-2014
MOVIN CODE AROUND LIKE ITS MY JOB