Best solution
Push
Merge branch 'master' of https://github.com/acatias/GoogleHashCode.git

Conflicts:
	src/chereau/Chereau.java
	src/saita/Basic.java