Initial commit
Merge branch 'master' of https://github.com/diegovilar/ppem

Conflicts:
	.gitignore