Updating lost work
Merge branch 'master' of https://github.com/americanmoss/sample_app

the commit.