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