Fixed merge conflict shit
Merge branch 'master' of https://github.com/c1phr/Spritz-Chrome