first commit
Merge branch 'master' of https://github.com/openjaf/spree_enhanced_sunspot

Conflicts:
	.gitignore
modifying gitignore