stuff
Merge branch 'master' of github.com:zwade/OXide

Conflicts:
	templates.html
newpage
Merge branch 'master' of github.com:zwade/OXide

Conflicts:
	highlight-schemes/pyScheme.js