Update christmas-wish-list.txt

I have no idea what I am doing :-]
adds nina's wishlist; resolves merge conflict between todd's changes and nina's changes