Created gh-pages
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	js/common.js
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/gh-pages'