ADDING EVERY BECAUSE WE DONT LIKE TO MERGE APPARNETLY.
Merge branch 'master' of https://github.com/waiteb3/chat-client
Because not pushing 2 weeks of work creats issues. Oh boy.