Updated font-awesome
Tweaked colors and fixed buttons/modal styles
Added badges to readme
Added .editorconfig file
Merge remote-tracking branch 'upstream/master'