Late-night changes
Merge branch 'master' of https://github.com/richarddwelsh/node-web-server

Conflicts:
	www_jade/test.jade
Added jade version of MegaSoft home page