change in structure and base application
Merge branch 'master' of https://github.com/moppedijk/project6-prototype