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