...
...
Merge branch 'master' of https://github.com/fephsun/orgo

Conflicts:
	models.py
	templates/index.html