Just wrote the basic groundwork for the app, Nick can take it from here!
Merge branch 'dev'
.gitignore updated