global settings
fixed conflict

Conflicts:
	.idea/workspace.xml
	pangea_project/pangea_project/urls.py
committing