Changed  line in changes.txt "hello pipo"
added hello pipo line
Merge branch 'master' of https://github.com/gametechnology/psi

Conflicts:
	changes.txt
added hello pipo I guess
Merge branch 'master' of https://github.com/gametechnology/psi