Update rubocop to be pulled from git.
Merge pull request #112 from DevYah/C1_mnzaki_commit_hooks

Update rubocop to be pulled from git.
Turn off rubucop line length check.

By popular demand.
Set the pre-commit hook to executable.

Bad mistake.
Merge pull request #113 from DevYah/C1_mnzaki_commit_hooks

Turn off rubucop line length check.
Added faker gem and populate.rake
resolved conflict
#114, added password
Fix Settings Migrations
#114, added 3 tags per idea
Merge pull request #114 from DevYah/C4_Hesham_Faker

Added faker gem and populate.rake
Add default value to settings
Merge pull request #115 from DevYah/C1_Sameh_#79_account_settings_migrations

Fix User Settings Migrations
Update pre-commit gem. Add white_space and tabs check. Remove erb from rubocop.
Fix pre-commit gem version.

Changed the wrong commit hash in the last commit.
Add .gitattributes file and autocrlf option.

Fix EOL problems.
Merge pull request #118 from DevYah/C1_mnzaki_commit_hooks

Fix some problems with pre-commit checks
Run through rvm if rvm is present

For Mac users with default RailsInstaller setup.
Merge branch 'master' into C1_mnzaki_commit_hooks
Update pre-commit Gem.

One more evil update.