Ändring i Jenstext.txt
Merge branch 'master' of github.com:/hansfilipelo/ChattY

Conflicts:
	jenstext.txt
Merge, tog min lokala fil.