django works here, too
Merge branch 'master' of github.com:DexterLB/unifordummies
resolved conflicts
Conflicts:
	unifordummies/settings.py
	unifordummies/urls.py
Merge branch 'master' of github.com:DexterLB/unifordummies