local database
add inherited_resources
add rspec tests
add new action
merge
about us
Merge pull request #175 from vincent178/master

READY: use inherited resources to remove duplication in controller