Merge branch 'master' of https://github.com/lanre-ade/CMPUT-366-PROGRAMMING-ASSIGNMENT-1

Conflicts:
	qLearning.py
merge