fixes conflicts
moves settings, preview/edit works
Merge branch 'master' into feature/settings
cleanup less
font > fonts
simplify settings modal
whitespace
Merge pull request #3 from greenkahuna/feature/settings

Settings Area