before merging
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	moetris.js
	moetris.ls
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
fix fire
add keys for ice fire and time
Merge pull request #3 from caasi/gh-pages

display access keys