Merge branch 'master' into MoreyBranch
GitHub is being weird; I'm sorry

.jar file
Revert 22f33c9..2c8dfc5

This rolls back to commit 22f33c9a30ed148b6871925ec4ff8263e4b014bd.
Merge branch 'MoreyBranch' of https://github.com/bgrayd/Tarsus into MoreyBranch
Reorganized the databse functions
Updated the Account Creation to reflect the new changes to login table
Merge branch 'master' into MoreyBranch

Conflicts:
	Tarsus/src/java/GameInstance.java
Merge Master Branch into Morey-Branch

Conflicts:
	Tarsus/nbproject/project.properties
	Tarsus/src/java/GameInstance.java
	Tarsus/src/java/Item.java
Got rid of Github nonsense
Merge branch 'master' into MoreyBranch

Conflicts:
	Tarsus/nbproject/project.properties
	Tarsus/src/java/GameInstance.java
Removed some Github Nonsense
Tried to fix errors
Working Logout I think
Merge branch 'master' into MoreyBranch2
Merge branch 'master' into MoreyBranch2
Maybe finished the pastCharactersState?
Item fixes and added basic delete item.

Fixed general item type bug. Got rid of constant potion thing as it was
making the corresponding attribute  ridiculous.  Created the delete item
function though it is probably missing a part involving the player's ID.
Merge remote-tracking branch 'origin/master' into BranDev-Branch
Merge remote-tracking branch 'origin/master' into JohnDev-Branch
Signup, Login, Logout all work. Fixed some Log Out typing inconsistencies