Updated main project
Misc changes
Merge branch 'master' of github.com:bvlahh/deco3850