Merge branch 'master' into kenneth_branch
fixing directories
Merge branch 'master' of github.com:ucfroboticsclub/ucf_robotics