added camera, merging
Merge branch 'master' of https://github.com/hirorir/GolfBawlz

Conflicts:
	MiniGolf.sdf
	MiniGolf.v12.suo
	MiniGolf/Debug/MiniGolf.Build.CppClean.log
	MiniGolf/Debug/MiniGolf.log
	MiniGolf/GameManager.cpp