test
Merge branch 'work' of github.com:kung-fu/first-pr into kung-fu-work

Conflicts:
	index.html
Merge branch 'kung-fu-work' into gh-pages