modified
chages to be commited

Conflicts:
	terminal.desktop