changed
Merge branch 'master' of github.com:nbozoglu/rails_projects
fix conflict