second commit
Merge branch 'master' of https://github.com/Chianti5/final_project
Merge pull request #3 from Chianti5/master

second change