Minor changes to model/controllers
About to push again
Created new project
Added database and basic editing view--still need to connect outlets
added v2
fixed conflicts
conflicts