proposal and proposal-view pages
working on proposal routes
fixed conflicts
proposal
started working on getting the wink to show up