silenced weird output
Fixed conflict
Merge branch 'master' into hw_04

Conflicts:
	Gemfile
	Gemfile.lock