initial commit (generated with RailsBricks v2.0.5)
Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore