maj script
Merge branch 'master' of github.com:KDemeul/ControlTheoryAssignment