minor changes
started working on editing all the deals for a business owner in settings
fixed merge conflicts
added differing styles to active/expired deals, added edit deal functionality to settings page