Added git init.
Merge branch 'master' of github.com:fvasquez/workshop

Conflicts:
	README.md

Erik changed same line.
I want both so I kept both.