...
Merge branch 'master' of github.com:gewoks/wishlist

Conflicts:
	test.php