Add Pins Association
Merge branch 'master' of github.com:jhach/omrails

Merging because of windows conflict