Removed app.iml file
Modified .gitignore to remove backslash before package
Merge branch 'master' of https://github.com/dcarrot2/RideSafe

Conflicts:
	app/app.iml