first commit
Merge branch 'master' of https://github.com/mathieuleclaire/prynt

Conflicts:
	.gitignore