Updates
Merge branch 'master' of github.com:gsheld/349_project