Example files added
Merge branch 'master' of github.com:knowledge7/effective-guide-to-git

Conflicts:
	example3/index.html