added bug fixes
fixed merge conflcts
fixed margin bugs
added css changes
Added admin hole
removed admin hole
fixed conversation chat
fixed chat css
changed javascript
changed sift filter to fit
added min height to bar
added scrolling fix to disccussion
fixed filter mobile bug
added slide up prompt
Merge pull request #66 from hzla00/newken

Newken
fixed merge conflicts
fixed drinks
reoved modal
fixed email bug
fixed tomorrow