resistance
Merge branch 'master' of github.com:Highvolt/FEUPdemic
resistance and bug fixes
Merge branch 'master' of github.com:Highvolt/FEUPdemic