yep
Merge branch 'master' of https://github.com/NoahSommerfeld/cs304.git

Conflicts:
	CS304Assignment/src/userInterface/User.java