First Commit
Merge branch 'master' of github.com:nlblunt/LearningRoR

Conflicts:
	README.md