Commit
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into localtest

Conflicts:
	HackathonFoShiz/HackathonFoShiz.csproj.orig
Edits
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into localtest

Conflicts:
	HackathonFoShiz/HackathonFoShiz.csproj.orig
	HackathonFoShiz/Partials/CrisisMap.html
	HackathonFoShiz/Scripts/app/controller/mapController.js
items