revert commit
end of game indicated by log messages
commit for metafiles
merge commit
solved conflicts
merge commit