get rid of .gitattributes
Merge branch 'master' into dev
www-live should be www-dev in dev branch
better README
fix port number 8000->80
www-dev to www-live in master branch