Carreirwave

I mixed up my branches and sorry for making it so confusing, to explain what originally happend I think I never really merged any branches and each new branch was the most up to date branch and sometimes I would not commit changes things from one branch. I should work on better compartmentalizing