Update .font-size shortcut to use rems properly
Merge remote-tracking branch 'origin/master'