Set up app
Merge branch 'master' of https://github.com/IanChar/testApp3