More GUI
Merge branch 'master' of https://github.com/danbox/cs314

Conflicts:
	edu/SouthernComfort/Library.java
	edu/SouthernComfort/MusicManager.java
	edu/SouthernComfort/Pair.java
	edu/SouthernComfort/PermType.java
	edu/SouthernComfort/Song.java
	edu/SouthernComfort/UI.java
	edu/SouthernComfort/User.java
	edu/SouthernComfort/UserManager.java