fix style bugs with ff
Merge branch 'master' of github.com:chilicomputer/renchi-static-package

Conflicts:
	dist/base.css
	dist/main.js