committing stupid prefs file
Merge branch 'master' of github.com:smcadams86/robot-control