It works mostly! Yay!
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_maps.xml
Now it actually draws a route on "O Route"