Partially fixing item dupe (#6)
Merge branch 'master' of https://Robotic-Brain@github.com/Robotic-Brain/WaterCraft.git