remove controller mapping, use single app file
Merge branch 'master' of github.com:freejacque/project_three_app
update app file to use merged layout and index