fixes #2 i added some text
erika tested
Text change
Merge branch 'master' of https://github.com/shawn/github-demo

Conflicts:
	index.html
fixed conflict text
Merge branch 'master' into gh-pages

Conflicts:
	README.md