fix typo
Merge remote-tracking branch 'upstream/master'
Add support for friendly_id resource finders.
Merge pull request #3 from richardonichol/master

fix typo
Automatic support for friendly_id using finders.
Automatic support for friendly_id using finders.
Merge branch 'master' of https://github.com/habanerohq/super_resources
Merge pull request #4 from richardonichol/master

Automatic support for friendly_id using finders.
Merge branch 'master' into version_2_0_0

Conflicts:
	lib/super_resources/nesting.rb
	lib/super_resources/resources.rb