Merge pull request #908 from thiagocatarse/bootstrap

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