Changed trash location
Merge branch 'master' of https://github.com/elimenta/robotics_capstone_team4