pulling
Fix merge conflicts
Hide Featured unitl click
Remove blank items from server
Build
Start styling
fixed merge conflicts
gulped