create conflict 2
Merge branch 'master' of github.com:daniel0076/sitcon-workshop

Conflicts:
	README.md