.env/ ignored
Templates decoupled
Index view added
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/templates/edit_map.html
Merge