Files to update
Merge remote-tracking branch 'origin/master'

Conflicts:
	PlayBoiler/src/cs307/team7/playboiler/User.java