new
Merge branch 'master' of github.com:stepandra/hackaton-chargemap

Conflicts:
	frontend/main.js