merge conflict
Merge branch 'master' of https://github.com/FaustineLarmagna/GlossNGlitterPrincessStore
No more error when trying to log with Facebook
Merge branch 'master' of https://github.com/FaustineLarmagna/GlossNGlitterPrincessStore