1
Merge branch 'master' of https://github.com/Oleg-Vlasenko/ruby-courses

Conflicts:
	struct/factory.rb