solved a little conflict on the test suite
Merge branch 'master' of https://github.com/TijoMONSTER/Instagram
Merge branch 'master' of https://github.com/TijoMONSTER/Instagram