init
Merge branch 'master' of github.com:ziobut/pean

Conflicts:
	.gitignore