Trying to get the git submodules to work properly. Also adding in my test_macro file temporarily
Fixed a merge conflict