about page
Merge branch 'master' of github.com:asmaps/nsupdate.info

Conflicts:
	nsupdate/main/templates/main/about.html
	nsupdate/main/urls.py
	nsupdate/nsupdate/templates/base.html