style
Merge branch 'master' of github.com:peetahzee/fitfactor-chrome