bugs fixed in library
Merge branch 'master' of https://github.com/danbox/cs314

Conflicts:
	edu/SouthernComfort/UI.java