Initial commit
Merge branch 'master' of github.com:plazowicz/RailsDemo

Conflicts:
	.gitignore