made some changes; things aren't working
Merge branch 'master' of github.com:mmcdermott/disease-modeling
movd files