init
Merge branch 'master' of https://github.com/jnber5/peintureloa

Conflicts:
	.gitignore
	README.md