Merge branch 'master' of github.com:SeaLions/csc324_dev_proj

Conflicts:
	MyWindow.java
Merge branch 'master' of github.com:SeaLions/csc324_dev_proj