Refactored code
Merge branch 'master' of https://github.com/sz-cs130/RobotOatmealAndroidApp
Merge branch 'master' of https://github.com/sz-cs130/RobotOatmealAndroidApp