sti testing
Merge branch 'master' of github.com:cliche2004/rails-sti-test