updated info
Merge branch 'master' of https://github.com/tadwhitaker/git_practice into new_branch