initial commit
Merge branch 'master' of https://github.com/brunofarache/pottle-converter

Conflicts:
	.gitignore