#94,added ban_unban method
#94, added documentation to ban_unban method
#94, linked the ban and unabn buttons to the ban_unabn method
#94, add UMLs for issue #93 and #94
issue#94 added rspec files
issue#94 fixed a bug
issue#94 fixed a bug
issue#94 added this file for testing
issue#94 added route
issue#94 added this file for testing
issue#94 added this file for testing
Remove .gitattributes file

It was setup incorrectly. Will be brought back later.
Merge branch 'master' of github.com:DevYah/coolsoft-13
Issue #169 added migration file for approved column and made approved attr accessible
Merge pull request #170 from DevYah/C2_mohammad-abdulkhaliq_#96_approve_committee_migrations

Issue #169 added migration file for approved column and made approved attr accessible
#94, added test files
#94,fix ban_unban method and added a new test method
Fixed indentation
Merge branch 'C2_omar-kassem_#94_ban_unban' into C4_Gezeery_#52_view_user_profile

Conflicts:
	Idearator/.rspec
	Idearator/app/controllers/users_controller.rb
	Idearator/app/models/user.rb
	Idearator/app/views/layouts/_navigation.html.erb
	Idearator/app/views/users/show.html.erb
	Idearator/spec/spec_helper.rb
Merge branch 'master' into C4_Gezeery_#52_view_user_profile

Conflicts:
	Idearator/app/models/user.rb