mass changes
made changes from meeting
Merge pull request #1 from dhopper7/myBranch

My branch