Gemlock
Merge branch 'master' of https://github.com/jcap49/issrace

Conflicts:
	Gemfile.lock
resolved merge conflict