Commit 1
Merge branch 'master' of https://github.com/vovchik33/FLASH

Conflicts:
	README.md