Adding Bear to Scene
Merge branch 'master' of https://github.com/JonComo/WatermelonNinja
Merge branch 'JonsBranch'

Conflicts:
	WatermelonNinja.xcodeproj/project.pbxproj
Merge branch 'JonsBranch'
added project back in
Revert 015f314..4db35c7

This rolls back to commit 015f314bc50ab91ad8546826d24a3295ef4ca24a.
merging again
Merge branch 'master' into JonsBranch