The Gem is now Hot -- login jokeyishness
Merge remote-tracking branch 'aroth4/master'
merge conflict
Merge conflict resolution (subsequently referred to from this point on
as MCR because 'why not?')