edit
Merge branch 'master' of https://github.com/jspencersharpe/Wishlist

Conflicts:
	js/factories.js
Merge branch 'master' of https://github.com/jspencersharpe/Wishlist

Conflicts:
	js/factories.js
more edits