Updating 11/10
Merge branch 'master' of git@github.com:lchrislee/Pokeman-Parody-Adaptation.git
Merge branch 'master' of git@github.com:lchrislee/Pokeman-Parody-Adaptation.git
Need to stay updated 11/14 1:30 AM
Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git

Conflicts:
	src/GUI/ChatGUI.java
	src/sidebarGUI/ChatGUI.java
Making class templates