Felix's edits
Merge branch 'master' of https://github.com/fephsun/orgo
Merge branch 'master' of https://github.com/fephsun/orgo
Felix's edits to models.py
Merge branch 'master' of https://github.com/fephsun/orgo
Felix's edits to views.py
Merge branch 'master' of https://github.com/fephsun/orgo
...