Fixed some things. Progress on #40. Pair Programming Arnas and Chris
Merge branch 'dev' of github.com:brunomperes/TeamE-semester2 into dev