first gh commit
add shake
Merge branch 'master' into gh-pages

Conflicts:
	index.html
fix bugs
Merge pull request #1 from mcdlee/gh-pages

fix bug