Initial commit
Merge branch 'master' of github.com:digiedu-sebastianm/rails-tutorial

Conflicts:
	.gitignore