modified preferences fragment
settings button
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/CarduinoAvengers/ControllerActivity.java
5/6