initial commit
Merge branch 'master' of https://github.com/gsapophis/pm

Conflicts:
	.gitignore
initial commit