add
Merge branch 'gh-pages' of https://github.com/bestian/frontend into gh-pages

Conflicts:
	index.js