player stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectSepia.as3proj
	bin/ProjectSepia.swf
	obj/ProjectSepiaConfig.old
	obj/ProjectSepiaConfig.xml
	src/Main.as
	src/Player.as