Unknown changes to loggedin.html
Unknown changes to views.py
Merge branch 'master' of https://github.com/fephsun/orgo
Changes to files from server
Merge branch 'master' of https://github.com/fephsun/orgo

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

Conflicts:
	views.py