Merge remote-tracking branch 'upstream/master'
ha
Conflicts:
	Assets/Resources/Prefabs/Game Manager.prefab
poop
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Assets/Resources/Prefabs/Game Manager.prefab
fa
Merge remote-tracking branch 'upstream/master'
Merge pull request #28 from shiyingzheng/master

Made background music work
Please fuck
Merge remote-tracking branch 'upstream/master'
Merge pull request #29 from shiyingzheng/master

Fixed some stuff
dsfadf
Merge remote-tracking branch 'upstream/master'
enemies won't go through walls
Levels.
Merge remote-tracking branch 'upstream/master'
Merge pull request #30 from MSwinton/master

Last Level.
boom.
build
sdfMerge remote-tracking branch 'upstream/master'

Conflicts:
	Assets/Resources/LevelFiles/OUT/Easter.txt
Done
Merge pull request #31 from PeterAguiar/master

Done