Merge pull request #9 from bwood8/master

updates 11/21
Temp Commit
Moved stuff around
Merge pull request #9 from jdugan6/master

12/2