Reverting Changes
Removed .xml files from .idea folder
Merge branch 'master' of https://github.com/dcarrot2/RideSafe

Conflicts:
	.idea/misc.xml
	app/app.iml