more controller updates
Merge pull request #25 from darrelljones13/associations

more controller updates