more refactoring
slight fixes from refactoring, runs blue screen again (the good kind of blue screen)
Merge branch 'master' of https://github.com/JLmike7/Senior-Design.git
Merge branch 'JLmike7'
Merge branch 'master'