added project/story relationship with tests
fix merge conflicts