initual push
Merge branch 'master' of https://github.com/RossLYoung/Django-Leaflet-Issue37

Conflicts:
	.gitignore