Able to connect with macbook
Merge branch 'master' of github.com:notokay/android_app

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/myfirstapp/app/BluetoothChatService.java
	app/src/main/java/com/example/myfirstapp/app/DeviceListActivity.java
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/layout/activity_remote_bluetooth.xml
	app/src/main/res/layout/device_list.xml
	app/src/main/res/layout/device_name.xml
	app/src/main/res/layout/message.xml
	app/src/main/res/menu/option_menu.xml