changed print
add trash
remove trash
add new string
Merge branch 'master' of /home/kachon/workspace/example2/../example

Conflicts:
	test.py
commit again
resolve conflict
again again example3
Merge remote-tracking branch 'origin'