idk
Merge branch 'master' of https://github.com/mbojey/COSC310A2 into duncan

Conflicts:
	SearchStorage.txt
Merge branch 'master' of https://github.com/mbojey/COSC310A2 into duncan
Merge branch 'master' of https://github.com/mbojey/COSC310A2 into duncan

Conflicts:
	SearchStorage.txt
	bin/Codebot.class
ignore