couch fixed
Merge branch 'newmaster' of https://github.com/torrmercury/GlobalGameJam2014 into newmaster