Updating stuff
Merge branch 'master' of github.com:team461WBI/website into TodoTesting
Merge branch 'TodoTesting' of github.com:team461WBI/website into TodoTesting