first
Merge branch 'master' of github.com:wa1demar/ruby

Conflicts:
	.gitignore

f