Improved site generator: now can insert full Python into pages
Merge branch 'master' of https://github.com/lamefun/linuxpromotion-web

Conflicts:
	template.html