From master.
From master.
Fixed merge issues, and east-west.
Added the PARTY!!
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into louiscarl
Merge pull request #18 from archcomet/louiscarl

Louiscarl