Oops
Updated readme
Merge branch 'dev'

Conflicts:
	playbook.yml
merge fix