Initial commit
Merge branch 'master' of github.com:seesharpsteve/RubyTrainingRails

Conflicts:
	.gitignore