first commit
Merge branch 'master' of https://github.com/aaronlaurel/learn-rails

Conflicts:
	README.md