asd
Merge branch 'master' of https://github.com/aialec/test

Conflicts:
	php.txt
added .gitignore