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

Conflicts:
	assignment 2.py