made changes
Merge branch 'master' of github.com:tbuchanan/Project-2