added ruby-version to gitignore
Merge branch 'master' into add_build

Conflicts:
	.gitignore