old changes to MainView
Merge branch 'master' of github.com:cathy888/AdvstatProject2

Conflicts:
	src/views/MainView.java
added listeners; wip