new merge test
Merge pull request #3 from adamapps/develop

new merge test