Initial commit
Merge branch 'master' of https://github.com/jackpgriffin/rails_search

Conflicts:
	.gitignore