Fixed_problem_in_conditions #217
Added_extra_line #217
Fixed Logout with design
Documentation added.
Fixed Documentation
Fixed Indentation fixed
Merge pull request #277 from Saftophobia/C2_Yomn_El-Mistikawy_Implement_an_achievement_system_#217

C2 yomn el mistikawy implement an achievement system #217
Redirections on design all fixed. #233
Updated before pulling master
Merge branch 'master' of https://github.com/Saftophobia/Sharesoft-14 into C4_omar_elmenawy_signup_#233

Conflicts:
	StartupMaps/blog/app/views/entities/show.html.erb
Profile fixed.
Indentation problems fixed.
Line added to application.html.erb
Fixed indentation in Edit.
Logout fixed.
Merge pull request #278 from Saftophobia/C4_omar_elmenawy_signup_#233

C4_Omar_ElMenawy_Logout_#233
Merge branch 'master' of https://github.com/Saftophobia/Sharesoft-14 into C4_Sarah_Fathallah_Send_and_Respond_To_Friend_Request_#118_#119
Added_migration_files_#238
Merge pull request #296 from Saftophobia/C3_Heba_AbdelFattah_Signup_map_migration_#238

C3_Heba_Abdelfattah_Added_migration_files_#238
Merge branch 'master' of https://github.com/Saftophobia/Sharesoft-14 into C4_Sarah_Fathallah_Send_and_Respond_To_Friend_Request_#118_#119