First Commit

comment
Merge branch 'master' of https://github.com/stevenvandervalk/Defibrillator_Locator

Conflicts:
	locaeder/static/index.html