I guess I had unstaged commits?
Merge branch 'master' of https://github.com/goodboyrobot/CptS471

Conflicts:
	Project2/471_prog2.py