owner 3 attempt conflict.
Merge branch 'master' of https://github.com/rayloveless/testTeamSite

Conflicts:
	index.html
.orig file?