Commit
Merge branch 'master' of https://github.com/lichtec/capstoneBot

Conflicts:
	test.py