Merge branch 'devel_week5'
Merge branch 'master' of https://github.com/fernandomdo/roomba_pp into devel_week6
Testing changes with Android Studio