Merging everything
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hackathon/Hackathon/Classes/Functions.cs
Bug fix

Bug fix