First commit
Merge branch 'master' of https://github.com/railsonlinux/learn-rails

Conflicts:
	.gitignore