I don't know. git told me I have to commit changes to map
Merge branch 'master' of https://github.com/DanielGarcia-Carrillo/Tunerra

Conflicts:
	templates/map.html
Merge branch 'master' of https://github.com/DanielGarcia-Carrillo/Tunerra
Added lat and lng attr to Region
Added in functionality to store lat and lng in region object
I don't know.
Merge branch 'master' of https://github.com/DanielGarcia-Carrillo/Tunerra

Conflicts:
	myproject/settings.py
	myproject/urls.py
	templates/base.html
Merge branch 'master' of https://github.com/DanielGarcia-Carrillo/Tunerra
stuff
Merge branch 'master' of https://github.com/DanielGarcia-Carrillo/Tunerra
Added in ajax requests
Merge branch 'master' of https://github.com/DanielGarcia-Carrillo/Tunerra