xMerge branch 'master' of https://github.com/BaySchoolCS2/ProjectRepo
xMerge branch 'master' of https://github.com/BaySchoolCS2/ProjectRepo

Conflicts:
	LICENSE

BaySchoolCS2/ProjectRepo,michardy/ProjectRepo,michardy/ProjectRepo,BaySchoolCS2/ProjectRepo,BaySchoolCS2/ProjectRepo,michardy/ProjectRepo,michardy/ProjectRepo,BaySchoolCS2/ProjectRepo