Fix basic relationships
Merge branch 'master' of https://github.com/cschubiner/CS-194-Final-Project