Merge branch 'gh-pages'
Weekly Commit

Weekly Commit
Merge branch 'master' into gh-pages
Week 4 commit

Fixed directroies and updated app
Merge branch 'master' into gh-pages