Initial Push
Merge branch 'master' of https://github.com/mbojey/COSC310A2

Conflicts:
	src/Codebot.java