services
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into testbranch
events
New Template Changes 12:07am
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into testbranch

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

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

Conflicts:
	HackathonFoShiz/HackathonFoShiz.csproj.orig
deleted all the extra backup config file bullshit
maps
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into testbranch
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