stashing
Merge branch 'master' of github.com:pjdicke/pixelflip

Conflicts:
	site/git_update.php