Merge branch 'master' of github.com:zhrivodkin/blog_01_rusrails

Conflicts:
	.gitignore