fixed superman-edit (of free text)
improved git somemore
improved git somemore
recovered file
resolved merge conflicts