it works
it works
renew all files
Merge branch 'master' of https://github.com/xandrck/RoR-GeekHub-Ruby-basics

Conflicts:
	.idea/codeStyleSettings.xml
	1.rb