more art assets and pNG also there's an obsolete file if u need to put stuff in there
Merge pull request #9 from IanGlascock/erica

Erica
These are the scripts for the character controls + triggers
Some changes to the background
Merge pull request #10 from IanGlascock/Ian_Branch

Some changes to the background
Merge branch 'master' of https://github.com/IanGlascock/FinalProject_v2 into Raj
Merge pull request #11 from IanGlascock/Raj

Raj
GUI&PopUPMenu
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