some experiments
Merge branch 'master' of github.com:DexterLB/unifordummies

Conflicts:
	templates/default/base.html