Added Gemfile.lock
Merge branch 'master' of heroku.com:secure-woodland-7944

Conflicts:
	Gemfile.lock
gemfile.lock X(