Added new file, Tejp
Set new nick for Tejp, New file iMax
Added information for Tejp and iMax
Changed nick of Tejp
Changed nick of Tejp
Added info about OS to Tejp
Merge branch 'dev'

Conflicts:
	Tejp