Guess stuff was changed
Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git

Conflicts:
	src/sidebarGUI/ItemListUI.java
Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git

Conflicts:
	src/sidebarGUI/ItemListUI.java
Merge branch 'master' of
git@github.com:lchrislee/Pokeman-Parody-Adaptation.git

Conflicts:
	src/sidebarGUI/ItemListUI.java
	src/sidebarGUI/SideBarMenuAdapter.java
minor pokemon changes