Avoid conflict on views.py
Merge branch 'master' of https://github.com/seanchamberlain/tuitionworks
Add tests for term dates and discount calculations