changed markups
markups revised
markups revised
markups revised
translated a few
translated a few
redone changes
redone changes
commit before merge to master
last merged state