Merge branch 'master' of https://github.com/loghina/GoogleChallenge.git

Conflicts:
	src/mainround/Main.java
test