Update
Merge branch 'master' of https://github.com/nickyudha/corknscrew

Conflicts:
	gallery/index.php
	wines/index.php