[UPDATE] Redesign layout
[FIX] conflict & add config.rb
Merge pull request #7 from aliaraaab/master

Redesign Layout