gemfile.lock
completely fucked up devise and re-installed it. phew.
Merge branch 'working': ouch. forgot to attach a detached head