bunch of code with no changes to functionality
Merge branch 'master' of https://github.com/Fumler/www-p2