Initial configuration
Merge branch 'master' of github.com:ftomassetti/civs-frege

Conflicts:
	.gitignore
Adding missing files