Merge branch 'zacDev'
added in character sprites
Merge branch 'master' into Sean_Dev

Conflicts:
	Assets/Scenes/theGame.unity
Merge branch 'Sean_Dev'
Merge branch 'master' into zacDev