testing rebeccas queries
Merge branch 'master' of https://github.com/esneider/relationshit-server