Changed a lot of things...
Merge branch 'master' of https://github.com/GabrielGhe/TumblrFamous