First commit
Merge branch 'master' of https://github.com/marcandregirard/RailsTuto

Conflicts:
	.gitignore