fucntion4 added
Merge remote-tracking branch 'origin/master'

Conflicts:
	TechCamp/src/com/example/techcamp/MainActivity.java
add permission for camera,bluetooth, sdcard
test