Long hair don't care
Merge branch 'master' of https://github.com/steve496/CSE480-Project1

Conflicts:
	Project1.py