Merge branch 'feature/7-fouls' into develop
#8: added pickup types
Merge pull request #15 from TitanRobotics/feature/8-pickup

Feature/8 pickup