finished all important stuff on models and associations. Also tested various queries for our database.
Merge pull request #7 from jonnyparris/Joe_Alex

finished all important stuff on models and associations. Also tested var...