Initial commit
Modified readme file
Added some file
Removed some file
Merge branch 'master' of github.com:alexander-hayden/learn-rails

Conflicts:
	.gitignore
	README.md
Resolving conflict