conflict common.css
Merge branch 'master' of https://github.com/hoangdd/7maru