Merge pull request #3 from SquadCollaborativeRobotics/fix_include_file_structure

Fix include file structure
Merge branch 'master' of github.com:SquadCollaborativeRobotics/CollectorBotReal into launch_file
Merge branch 'launch_file' into navstack
Merge branch 'navstack' of github.com:SquadCollaborativeRobotics/CollectorBotReal into navstack
Merge branch 'navstack' of github.com:SquadCollaborativeRobotics/CollectorBotReal into navstack
Changes made during testing
Merge branch 'navstack' of github.com:SquadCollaborativeRobotics/CollectorBotReal into navstack