Added icon to game (I know not a big deal)
Merge branch 'master' of https://github.com/charliebear/EECS370

Conflicts:
	Platformer.fla