rails view
Merge branch 'master' of github.com:Novamantic/classified