Added intentional conflict 2
Merge branch 'master' into demo_branch1

Conflicts:
	index.html
Resolved conflicts.
Merge pull request #3 from dcampbell-vsm/demo_branch1

Demo branch1