proposal stuff on my laptop
Merge branch 'master' of github.com:jmh045000/utd_cs6301_project