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

Conflicts:
	HackathonFoShiz/HackathonFoShiz.csproj