message.txt の削除
Merge branch 'master' of github.com:kdeintro/web

Conflicts:
	introduce2014/messages.txt