continue the decoration
more work
solve the conflict
resolved another conflict for what companies are saying
recover the javascript function
better for footer
adjust navbar link horizontal padding
made some changes
merge conflict resolved
Merge pull request #2 from mantacode/round-2-shanhe

WIP: continue the decoration