Added intermediary relationships to all models
022714 Merge Kat's Tests with Master

Merge branch 'master' of https://github.com/kylechadha/Transit-App