initial commit
Merge branch 'master' of github.com:cgeoffray/a-chieve

Conflicts:
	.gitignore