part 3.1
Merge branch 'master' of https://github.com/TimDu/proj1.git

Conflicts:
	proj1/src/Main.java
Merge branch 'master' of https://github.com/TimDu/proj1.git

Conflicts:
	proj1/src/Main.java