add gem to girignore
use require_relative instead of require. Better ;)
Merge remote-tracking branch 'origin/master'