address conflict
address conflict
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
Camera bug fixed
Merge pull request #9 from lyg830/master

Camera bugs Fixed