Working through constraints
Merge branch 'master' of github.com:edenzik/128Project
Added primary key, working on foreign key