First commit
Merge branch 'master' of https://github.com/dom18fr/corporateconvention2014

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/dom18fr/corporateconvention2014