revert gem
remove log
stash changes
stash
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile