Fixed what was a broken merge
Merged
Merge branch 'master' of github.com:mynt1011/343_lab4_design