Updating with SwingNode Code // Broken
Merge branch 'master' of https://github.com/cjeffery/sworsorc
testing git with netbeans
move spell classes into model folders

Also combined several classes, add spell_testing config
Merging changes...
Merge branch 'master' of https://github.com/cjeffery/sworsorc
Documentation changes, added conductor/network client interface methods
NetworkClient is now static. Fun times await...
Removed ServerThread. No file escapes the banhammer!
Graveyard folder: temporary backups, for major changes, or just any old code that might be useful to keep around
Bunch of changes to NetworkClient to make static
Cleaned up some cruft I found while browsing through all the files
Wrote another overly-long commit message
Github is throwing a fit. Looks like I'm going back to doing a bunch of little commits.
Is it annoying you?
Go yell at the creators of Git, not me.
Delete NetworkClient.java

How to deal with conflicts: nuke the natives, pave roads over the radioactive glass
Merge origin/master

Conflicts:
	src/server/systemServer/NetworkClient.java
Made a network client! Now we can do networking! 

The a red wizard, empowered by his sun being dominant, reverted the destruction of the nuke, and added some more flowers to boot.
Eliminated zombie ChatClient
FINISHED MOVE CALCULATOR...kinda...:D
Merge branch 'master' of https://github.com/cjeffery/sworsorc
bumped a javadoc update to move calculator
comments again
Moved Characters
Merge origin/master