changed loading things, could be applied to other things, but too lazy
Merge branch 'master' of github.com:team461WBI/website