initial
Merge branch 'master' of github.com:vodolaz095/a_test

Conflicts:
	LICENSE