last commit
Merge branch 'master' of https://github.com/Jackesa/COGrip

Conflicts:
	COGrip_project/res/layout/activity_main_screen.xml
	COGrip_project/src/com/example/cogrip_project/BluetoothService.java