Merge branch 'master' of https://github.com/hackmcgill/ai

Conflicts:
	oct1/README.md