menu
Merge branch 'master' of https://github.com/LCSTeam/Javapoly

Conflicts:
.classpath
bin/.gitignore
Merge branch 'master' of https://github.com/LCSTeam/Javapoly

Conflicts:
	.classpath
	bin/.gitignore