Changes to be committed:
modified:   controllers.py
modified:   data/models.py
modified:   views.py
Merge branch 'master' of http://github.com/paslo22/ternier