...
Merge branch 'master' of https://github.com/qimmer/indiejam2014

Conflicts:
	Assets/Scenes/main.unity