Fixed Conflict Commit

Conflicts:
	system/kernel/text.php

My first serious GitHub project :\