I guess there were two new additions (I didn't add these, but it's asking me to commit)
Merge branch 'master' of https://github.com/jdhand90/Epitool4912

Conflicts:
	Gemfile.lock