removing GUI package
Adding gui package
Silly DS_Store business :wink:
Merge branch 'master' of github.com:dalanmiller/Scotty

Conflicts:
	src/com/cmu/scotty/gui/package-info.java
Merge branch 'master' of github.com:dalanmiller/Scotty