Rearranges things to better fit C++ style
Merge branch 'master' of https://github.com/OSUrobotics/privacy-interfaces