idk
Merge branch 'master' of https://github.com/DanielGarcia-Carrillo/Tunerra

Conflicts:
	tunerra/models.py
fixed some map bugs
Merge branch 'master' of https://github.com/DanielGarcia-Carrillo/Tunerra