Revert "Revert this stuff"

This reverts commit 3214f63ab3bbbb704d3c697793342ce9b0a0b685.

Conflicts:
	.gitignore
Revert "Revert this stuff"

This reverts commit 3214f63ab3bbbb704d3c697793342ce9b0a0b685.

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/BtechBCITBoiz/7104ChatClient