Salut
Merge branch 'origin/master'

Conflicts:
	README.md
Merge branch 'origin/master'