Not really changes
Merge branch 'master' of https://github.com/dalanmiller/Scotty

Conflicts:
	src/com/cmu/scotty/gui/MainWindow.java
Okay okay okay okay okay
Merge branch 'master' of https://github.com/dalanmiller/Scotty

Conflicts:
	src/com/cmu/scotty/persistence/StudentDao.java
Merge branch 'master' of https://github.com/dalanmiller/Scotty