iris lv 2.2 c updates
Merge branch 'master' of https://github.com/Oreganik/GGJ-Eugene-2014-v2

Conflicts:
	Assets/Zach/lvl3-2.png.meta