[FINISH] Finished app
Merge branch 'master' into alex