Initial commit
Merge branch 'master' of github.com:amirasaad/rails-social-media

updated from local