Ignoring RubyMine IDE files
Merge branch 'master' of https://github.com/jkamenik/carrierwave_direct

Conflicts:
	.gitignore