update
converted to rems (scalable with html font size!)
reset to base size before merge
Merge branch 'rem-refactor'