Modified Structure & CSS
resolve conflicts
Merge branch 'master' of https://github.com/taekwo/El-Masrien