added core code
added feature 1
added feature 2
dev commit
work on ft 1
work on ft 2
more work on dev
Merge branch 'feature/feature_1' into develop
moar work
Merge branch 'feature/feature_2' into develop
Merge branch 'develop'