NEWFLOM added
Merge branch 'flomaster'
modified flomaster
Merge branch 'master' of https://github.com/ka4eli/Client_Telnet

Conflicts:
	flomaster.txt