Fix important typo.
Fix conflict.
Remove some reset CSS. Fix #17
Merge masetr.