update function
Merge branch 'master' of github.com:sn0/pshare

Conflicts:
	index.php
	index.php.sha