more test commits
added another file for testing
Merge branch 'testfeature2' into develop