minor changes
resolved merge conflicts
more layout fixes
added company index, display products, some other css
Merge pull request #10 from me33dy/aaronbranch

Aaronbranch