Fixing bad merge
Merging #4
Merge remote-tracking branch 'upstream/master'
add path for dominicgoulet
ignore Gemfile.lock since we're both testing using different paths.