merged base.html
merged base.html
merged base.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/default/programme.html
	unifordummies/urls.py
Merge branch 'master' of github.com:DexterLB/unifordummies
.
much change (post and posts template and the corresponding views), such fixes, so work. wow.
Merge branch 'master' of github.com:DexterLB/unifordummies
???