prefab
merge
merge2
commit3
merge4
merge 5
Merge branch 'master' of https://github.com/GlobalGameJamTeam/GlobalGameJam2014

Conflicts:
	Assets/GlobalGameJam.unity