stuff before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Platformer/Platformer.sdf
	Platformer/Platformer.v12.suo