bad
Merge branch 'master' of https://github.com/infinitydelta/platformer

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/c3/c3a88319d4bd902439a07579032cc493
	platformer.userprefs
multiple player support, projectiles deal dmg

sprite background
sprite chars
variables for keyinput = change keys
projectiles have trails
basic enemy script death (no ai)