whatver
Merge branch 'duncan'

Conflicts:
	bin/Duncan.class
	src/Codebot.java
	src/Duncan.java
Fixed conflicts
fixed conflicts in duncan.java
stuff
Merge branch 'master' of https://github.com/mbojey/COSC310A2 into duncan