Merge branch 'Sprint3' of https://github.com/WhyNotZoidberg/SW6Parrot into Sprint3
Merge branch 'Lisbeth' into Sprint3
Merge branch 'Lisbeth' into Sprint3