:x
Commitify
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Reset the settings and app.scss files and changed em to rem in custom
Settings moved over, now working on topbar settings
More settings updates
Topbar adjustments
Topbar color fix
Social button fix
Fixed Javascript
Final touches to conclude the update, besides the top bar margin thing