merge fix
Merge branch 'master' of https://github.com/donovangini/3110-ps6
test changes
Merge branch 'master' of https://github.com/donovangini/3110-ps6

Conflicts:
	release/aBuild.ml
	release/bots.ml