Felix's edits to synthProblem.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
Felix's changes to views.py
Felix's changes to models.py
Merge branch 'master' of https://github.com/fephsun/orgo
Felix's changes to views.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
Felix's edits to views.py
Merge branch 'master' of https://github.com/fephsun/orgo
Felix's edits to views
Merge branch 'master' of https://github.com/fephsun/orgo
Halfway through adding chat functionality