shit I forgot to ignore bower folder
cleaning
Merge branch 'master' of github.com:ricardocasares/openflix