adding change 2 to index.
Merge branch 'master' of github.com:jmatth/git_tutorial

Conflicts:
	index.html