Merge pull request #1 from csce431-e/master

gimmee
Merge pull request #2 from csce431-e/master

gimmee again
Added my stuff.  good so far yay
Merge pull request #3 from mstombaugh/master

take my stuff