Merge commit '0078387b'
merged functional Network into master
Conflicts:
	Server/Server.pro
	Server/include/Story.h
	Server/main.cc
Revert "Merge commit '0078387b'"

This reverts commit 33e5fbaec11ea3f0db614449e4b3fcc0e64152f5, reversing
changes made to 1149b3d2540d92ada8024510d4ba476f321b4dae.
Merge branch 'save-load'

Conflicts:
	Server/Server.pro
	Server/include/ValueBlock.h
	Server/main.cc
	Server/src/ModifierBlock.cc
	Server/src/ValueBlock.cc
Merge pull request #12 from ROLL-E/master

Master to logictree
Finishing touches to logicblocks
WaitBlock will now save and load previous_modifier
Fight now has current_char_can_make_move(). Will also handle empty scenarios correctly
Fight now has error handling
Fight now uses Q-version of list and map
Merge pull request #13 from ROLL-E/logictree

Logictree into master
Updated fight, now has get_characters() and has error handling when adding same character twice.
Prototype of character handling
Now displays and edits attributes and characters
Now handles items as well
Merge done