Feature 2 some work done
Adding some tests
Merge branch 'develop' of https://github.com/davethehawaiian/buildsystem into develop

Merge message?
Adding some code for feat 2
Merge branch 'feat2' into develop

Merging finished feature 2 into development