Something
Merge branch 'master' of https://github.com/dannynelson/giftlist

Conflicts:
	app/www/js/app.js
Background color
image resize
Merge branch 'master' of https://github.com/dannynelson/giftlist