Initial Commit
Merge branch 'master' of https://github.com/Mbarney928/learn-rails

Conflicts:
	.gitignore