Merge pull request #3 from cmonaghan/master

Added gifts views
able to query api for wishlist blog
Merge pull request #4 from stateoflux/master

able to query api for wishlist blog
Merge branch 'master' of https://github.com/dannynelson/giftlist

Conflicts:
	app/www/templates/search.html