I dont know why my Gemfile.lock changed, but whatever
Merge branch 'master' of github.com:Spontraineous/Spontraineous