undo 6f870f08ae0e79248085f0f7813777e09f59959c
Merge branch 'master' of github.com:team461WBI/website