Commit of Rails code without rSpec test
Merge branch 'master' of https://github.com/ed-rw/rails-challenge

Conflicts:
	.gitignore