added join table and fixed controllers
Merge pull request #20 from mwdion/master

added join table and fixed controllers
Merge pull request #21 from belindahare/master

working out layouts