Initial commit
Associations added for 3 way M-M
conflicts resolved