Editing makeReagentHtml
urls.py
Merge branch 'master' of https://github.com/fephsun/orgo

Conflicts:
	urls.py
	views.py