Changed some more things
Merge branch 'master' of https://github.com/gritterm/SeniorProject.git