Don't know how this got fucked up, but I made all the changes again from scratch, so it should be fixed.
Merge branch 'master' into tryingToFix
Fixing the site and moving stuff to git