bluetooth permission added to manifest and mainActivity slightly changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/hackfest/greylock/musicasleep/MainActivity.java
Merge remote-tracking branch 'origin/master'
Updated UI