cut some unnecessary code and move some code to the right place
Merge branch 'master' of https://github.com/jonasrla/VoosBaratos
Some start code for the result