i add some thing
Merge branch 'master' of github.com:geekhub-js-2014/scaling-octo-meme

Conflicts:
	index.html