Fixed some more things for compiling
Merge branch 'master' of github.com:mynt1011/343_lab4_design