Several changes and ready to merge
Merge branch 'master' of https://github.com/Eating/d969d0fe5a0ff193

Conflicts:
	Asgn2/src/asgn2GUI/MainPage.java