#1 and #2 done in java
Merge branch 'master' of https://github.com/acompagno/ProjectEuler

Conflicts:
	.gitignore