Initial commit
Updated Gemfile
Merge branch 'master' of https://github.com/dmferrari/learn-rails

Conflicts:
	.gitignore