change
more change
Merge branch 'master' of https://github.com/Whhoesj/PRC32

Conflicts:
	sluice/sluice.pro