Getting this all working
Merge branch 'master' of http://github.com/giovannicarvelli/SE261

Conflicts:
	SE262/src/ListFrame.java
	SE262/src/MyView.java
	SE262/src/Study.java