Sup dudes
Create test.html
Added a github git cheet sheet
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	index.html
	story.html