Removed debugging for pushing to master
Battle State basically done

Battle state just needs get next enemy and level up state
Level up done, unreg char creation no longer works

Unregister character creation no longer works for unknown reasons, I
will be rolling back to find what caused the failures
unreg char creation

found the error, still not fixed, it is the home button
Got unreg char creation working again

seperated the unregistered user character creation into smaller pieces
and put the part that was failing in a try catch block
Added error handling to character creation

when an invalid name or bio is used in the character creation, it
recreates the page and displays a pop up message
Added base health
Merged from master

Fixed merge conflicts with merge from master
Added DB functionality to character creation and level up

Added updateCharacter, addCharacter, and addItem functions.  Still needs
debugging
I'm trying to fix the login and signup functions. Do not merge from this right now
Still not working
Merge branch 'master' of https://github.com/bgrayd/Tarsus

Conflicts:
	Tarsus/nbproject/project.properties
	Tarsus/src/java/GameInstance.java
	Tarsus/src/java/Item.java
Remove Github Nonsense

Still not good
Fixed sql errors from master

Repaired the sql functions from the master branch
merged with master

Fixed merge errors from merge with master
merged with BillyDevBranch

merged with BillyDevBranch and fixed the errors in this branch, I think
merged from master

working on stopping the huge merge errors
Merged with master

merged with master, still working on fixing it always merging with
errors
merged with BillyDevBranch

Still working on fixing errors
Merge remote-tracking branch 'origin/BillyDevBranch'