first
Merge branch 'master' of https://github.com/kilanoff/ruby_rails_worktest

Conflicts:
	.gitignore