special string is up-to-date
Merge branch 'master' of https://github.com/GeaRvmk/alex_edu

Conflicts:
	readme.txt