initial commit (RailsBricks 3.0.1)
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore