Merge pull request #1 from MaffooBristol/testing-branching

Testing branching... This should work!
Testing git submodules...