init
Merge branch 'master' of github.com:odradeck/mompao

Conflicts:
	.gitignore