Addition of different rooms, button added to switch to the living room activity
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/cs481/rbamap/flipswitch/MyActivity.java
Addition of different rooms, button added to switch to the living room activity
Merge remote-tracking branch 'remotes/origin/master'
Merging SensorController