Merge branch 'master' into JonsBranch
added title screen
Merge branch 'JonsBranch'

Conflicts:
	WatermelonNinja.xcodeproj/project.pbxproj