changed comment to cause conflict
Merge branch 'master' of https://github.com/markmichaelrichter/animusbit

Conflicts:
	main.py