GUI&PopUPMenu
final congrats scene
Merge pull request #12 from IanGlascock/erica

final congrats scene
Merge branch 'master' of https://github.com/IanGlascock/FinalProject_v2 into Kuan

Conflicts:
	Assets/8 bit art/monster2.jpg.meta
	Assets/8 bit art/player1.jpg.meta
	Assets/8 bit art/player2.jpg.meta
	Assets/8 bit art/reset1_v2.png.meta
	Assets/8 bit art/reset2_v2.png.meta
	Assets/8 bit art/start1_v2.png.meta
	Assets/GUI/reset1_v2.png.meta
	Assets/GUI/reset2_v2.png.meta
	Assets/GUI/start1_v2.png.meta
	Assets/GUI/start2_v2.png.meta
	Assets/scripts/KillingPlayer.cs
Merge remote-tracking branch 'origin/master' into Kuan

Conflicts:
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
Merge pull request #13 from IanGlascock/Kuan

Kuan
Merge commit '030c0bb3b689bece5af9fa8cc48bcda131f85745' into Ian_Branch

Conflicts:
	Assets/prefabs/Seeds.prefab
	Assets/scripts/scorez.cs