Playing around with menus on layout
Merge branch 'master' of https://github.com/rbare1/FlipSwitch

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/cs481/rbamap/flipswitch/MyActivity.java
	app/src/main/java/house/mobilecontrollers/SensorContoller.java
	app/src/main/res/layout/activity_my.xml
Merge branch 'master' of https://github.com/rbare1/FlipSwitch
Changes to the Controller and some of the activity for new implementation
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_my.xml
New Multi Room Light implementation
Merge remote-tracking branch 'origin/master'