new file:   GameMain.java
	new file:   Readme.txt
	new file:   View.java
	new file:   hw02/hw02.java
	new file:   hw02/life.txt
	new file:   hw06/Conway.java
	new file:   hw06/ConwayGUI.java
	deleted:    GameMain.java
	deleted:    View.java
Merge branch 'master' of https://github.com/morfious902002/java