base project Rails
Merge branch 'master' of https://github.com/jduarte/kaminari-preview

Conflicts:
	.gitignore