test conflits
Merge branch 'master' of github.com:StephenNUNES/clermonttech-workshop-git

Conflicts:
	README