Merge branch 'bootstrap' of github.com:pedromarins/catarse into bootstrap