fixed merge issues
authorKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 2 Oct 2012 18:08:52 +0000 (11:08 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 2 Oct 2012 18:08:52 +0000 (11:08 -0700)
commitc30d63a7c78c80fb8eb58f1e4b9d3003776bb95a
treee5850822c27dbf10139636cfc57b83dacad678d6
parentb89c1920785006652e427abc903093a8691f075d
fixed merge issues
business.js
style.css