Cleaned some code up
Merge branch 'master' of https://github.com/nlubczynski/SchoolWork.git