push shopfair
push shopfair3
add home interface
merge
Merge branch 'master' of http://github.com/awidarto/shopfair

Conflicts:
	application/views/partials/publictopnav.blade.php
	application/views/shop/home.blade.php
	public/.DS_Store
deals interface
upload second
shopfair