all the latest updates
Merge branch 'master' of https://github.com/tiffanitt/github_demo into new_branch