app data
Merge branch 'master' of https://github.com/urchy/Internship_Info

Conflicts:
	carsharing/carsharing/settings.py
	carsharing/carsharing/settings_local.py
	carsharing/carsharing/setup/requirements.txt
	carsharing/carsharing/urls.py