modified:   Team13/src/Menu.java
modified:   Team13/src/User.java
modified:   Team13/src/UserinfoPane.java
modified:   Team13/src/Menu.java
modified:   Team13/src/User.java
deleted:    Team13/src/UserinfoPane.java
Merge branch 'master' of https://github.com/puteam13/cs408

Conflicts:
	Team13/src/UserinfoPane.java