basic app structure
Merge branch 'master' of github.com:matewilk/M2