Initial commit
Merge branch 'master' of https://github.com/daviddumas/cp1

Conflicts:
	.gitignore