person
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into workingTest
Added item
Updated DbContext class
Merge remote-tracking branch 'origin/PaulWorking' into testbranch
Added controllers for Item stuff
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into workingTest
Data Seeding JRN 8:45
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into testbranch
bug fix
Commit and push
Merge branch 'workingTest' of https://github.com/sabotuer99/hackathon-V2.0 into PaulWorking

Conflicts:
	HackathonFoShiz/HackathonFoShiz.csproj
events
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into workingTest
mapController
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into PaulWorking
Merge https://github.com/sabotuer99/hackathon-V2.0 into testbranch
Added actions to api controllers
Merge branch 'testbranch' of https://github.com/sabotuer99/hackathon-V2.0 into testbranch
services