texture changes

I moved the camera let me know what oyu think
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameApplication.cpp