updated app to make it run
Merge branch 'basic_fixes_to_run_app'