Added basic text
Merge branch 'master' of github.com:imjared/git-training into webpage-mike

Conflicts:
	webpage/index.html