added some updates
Merge branch 'master' of github.com:dogshare/rails-app