Presets
Commit to pull
Merge branch 'master' of https://github.com/rbare1/FlipSwitch

Also commit to pull
Conflicts:
	app/src/main/java/cs481/rbamap/flipswitch/MyActivity.java
Merge branch 'master' of https://github.com/rbare1/FlipSwitch
Completion of the presets
Everything on the Android side merged