add
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
camera bug fixed
Merge pull request #3 from lyg830/myCamera

My camera
address conflict
Update org.eclipse.jdt.core.prefs
Merge pull request #4 from lyg830/myCamera

address conflict
Merge pull request #5 from MobileComputing2013/camera

camera bug fixed