Fixes conflicts
Merge branch 'master' of github.com:Codystringham/stylertron
Adds basic styling and ability to use negative shadow and inset shadow