Silly autogenerated eclipse code
Merge branch 'master' of github.com:dalanmiller/Scotty

Conflicts:
	src/com/cmu/scotty/gui/MainWindow.java
Need these