initial commit
Merge branch 'master' of github.com:astiam/joanette

Conflicts:
	.gitignore