first merged commit
Merge pull request #1 from adamapps/develop

first merged commit