setting up to merge
merged files and fixed conflicts
Merge branch 'master' of https://github.com/secondbreakfast/CycleSafe_deploy

Conflicts:
	db.sqlite3