First deploy of api to heroku
Added the upstream
Attempting to resolve errors.
Pulling from upstream.
Most Recent updated master from upstream.
Final Merges
Created all controllers with these methods: Show, Index, Create model_name_params. All working on my local server.
Ammending merge conflicts.
Rolled back migrations.
Trying to resolve merge conflicts.
Copy and pasted schema file from master branch.
Copy and pasted user model from master branch.
Copied schema and user.rb files from master branch after running a git pull from the upstream in that branch. Pasted those files over their sibling files in the create_controllers4 branch to ammend merge conflicts.
Merge branch 'create_controllers4' of github.com:CollinBlinder/pixelect-api into create_controllers4
Trying to solve mystery of the changing gemfile.
removed error markers from gemfile and gemfile lock.
Merge pull request #13 from CollinBlinder/create_controllers4

Created Controllers, reset to upstream on 4th iteration of create_controllers branch.