commit before pull (worked on getting unique relations work)
fixed merge conflicts
Merge pull request #39 from Gegga87/master

8/12