Initial commit
Merge branch 'master' of github.com:johntyree/traduisons-hs

Conflicts:
	.gitignore