merge
Merge branch 'master' of https://github.com/catarse/catarse into submit-project
update monkeymail
update .lock
fix all bugs from bugheard for how-it-works
Merge pull request #728 from adrianob/update_monkeymail

Update monkeymail
Merge branch 'master' of https://github.com/catarse/catarse into submit-project
Merge branch 'bootstrap' of github.com:catarse/catarse into submit-project
adding bootstrap branch to travis build
changing values in how_it_works to make them dynamic
Merge pull request #729 from pedromarins/submit-project

update and bug fixes on how it works page