Ready for demo
Merge branch 'dev' of https://github.com/Waderoni/RideAlong into dev