first commit
base Zend Framework install
started dev
added abstract controller
test
conflict resolution
abstract controller added
got small-business-starter working
made dropdown menu and product widgets
conflict resolution
added a lot of stuff
added public directories
added footer file
Merge branch 'master' of github.com:dandb/mycredit
Merge branch 'master' of github.com:dandb/mycredit
added partials template folder
added public directories
footer
Merge branch 'master' of github.com:dandb/mycredit

Conflicts:
	www/application/layouts/scripts/layout.phtml
added additionial type for product widget