solved conflicts
completed river and zipcode search
began river styling
Merge pull request #17 from whileyryan/user_profile

User profile