gitignore for Gemfile.lock
gitignore for that file for real
Merge branch 'master' of https://github.com/jdhand90/Epitool4912

Conflicts:
	Gemfile.lock
gitignore again
and again