init
Merge branch 'master' of https://github.com/h2rd/rails-playing

Conflicts:
	.gitignore