smaple
Merge branch 'master' of https://github.com/ruby-victor/home

Conflicts:
	file1