Committing models.py before pulling?
Merge branch 'master' of https://github.com/fephsun/orgo

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

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