introducing
fact
merged to master
Merge remote-tracking branch 'origin/feature_moretext'

Conflicts:
	index.php