Added option to save presets to a file
Merge branch 'master' of https://github.com/rbare1/FlipSwitch

Conflicts:
	app/src/main/java/cs481/rbamap/flipswitch/MyActivity.java
	app/src/main/res/layout/activity_living_room.xml