added a lot of shit
Merge branch 'master' of https://github.com/chuckleplant/ggj2014
as
ready to upload