Revert to 254be242b0f33e571ee095b47cdf4f76ac750870
fixing error
fixing major merging issue
Merge pull request #41 from thehelpsf/revert-38-feature/chat-ui

Revert 38 feature/chat ui