Ignoring project files
Merge branch 'master' of https://github.com/rgaspary/Project-Euler

Conflicts:
	.gitignore