Merge pull request #6 from SomeGuyBrandon/master

The stuff I ruined that I fixed
project we showed to grader for Evaluation 4