pushing final changes for the night
Merge branch 'master' of https://github.com/igrande0/CSCE-315-Project-2