Added counter, Fixed bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	A2.py
Merge branch 'master' of https://github.com/ethanwaldie1996/A2