some changes

messed with test level
Merge branch 'master' of https://github.com/UWGameJam2014/Holocene2
Merge branch 'master' of https://github.com/UWGameJam2014/Holocene2