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
Merge branch 'MoreyBranch'
Revert "Merge branch 'MoreyBranch'"

This reverts commit c042c95eba118321b90f498de45509eb137d10c0, reversing
changes made to 5dd17e619db7decc31b55ab5d1b13162896d74bb.
Merge branch 'MoreyBranch2'
Merge branch 'master' into MoreyBranch2
Fixed Log in-> Log In changes.

The Log In, Log Out, and Sign Up pages should all be fully functioing
Merge branch 'master' into MoreyBranch2
Fixed Profile State button Display