proposal and proposal-view pages
working on proposal routes
fixed conflicts
gifts can be added to the cart
proposal
started working on getting the wink to show up
merged gifts