committing changes made over teh weekend
Merge branch 'master' of https://github.com/benreese0/SeniorProjectII