17.01.2013 on job
Merge branch 'master' of https://github.com/idoziru/school

Conflicts:
	alphapoet.py
	data/texts.txt