Merge pull request #27 from RubyGarage/feature/account_settings

Feature/account settings
Merge branch 'master' into feature/social_network_auth