add associations to models
Merge branch 'master' of https://github.com/dyg2104/newstips