updateS
Merge branch 'dev' of github.com:PebbleRoad/website into dev
.htaccess http redirects from old urls