Gemfile.lock change
Merge remote-tracking branch 'origin/master'
trying to fix everything...
this broke shit
fixing shit