Fix responsive issue
Added logo
logo
fixed a conflict
Merge branch 'ahmadajmi-master'