Commit and push
Merge branch 'workingTest' of https://github.com/sabotuer99/hackathon-V2.0 into PaulWorking

Conflicts:
	HackathonFoShiz/HackathonFoShiz.csproj
mapController
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into PaulWorking
Working Crisis Map
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into PaulWorking

Conflicts:
	HackathonFoShiz/HackathonFoShiz.csproj
	HackathonFoShiz/Scripts/app/app.js
	HackathonFoShiz/Scripts/app/services/LocationServices.js
	HackathonFoShiz/Views/Home/Index.cshtml
fixed mapController
Merge branch 'PaulWorking' of https://github.com/sabotuer99/hackathon-V2.0 into testbranch

Conflicts:
	HackathonFoShiz/HackathonFoShiz.csproj.orig