committing App
Merge branch 'master' of github.com:team-8/jam-2