!
Merge branch 'master' of https://github.com/vuntrannguyen/rails-tutorials-chapter-2

Conflicts:
	.gitignore