Updates for Static Pages
Merge branch 'master' of https://github.com/idno/idno

Conflicts:
	css/default.css