Initial Github push
Merge branch 'master' of github.com:jfmatt/Provence

Conflicts:
	.gitignore