lvl 1
Merge branch 'master' of https://github.com/GameBuilders/student-gdc-2014

Conflicts:
	assets/levels/level1.map