fixed a little things
merged
Merge branch 'master' of https://github.com/JLmike7/Senior-Design.git