Updated models and test
Merge branch 'master' of https://github.com/Alan502/friendlycommuter.git
Added an import to views.py that should help to fix it.