bens commit
fixed css bugs on bughurd
fixed htaccess
Merge branch 'master' of github.com:blackandblack/tide-and-pool