Merge branch 'release/release'
Merge branch 'release/release_1.0.1'
Merge branch 'release/release_1.0.2'
testing something
test
test
test
test2
Revert "test"

This reverts commit 38470b290e61a53f7cea726f4424e30a1c78a3f9.
Revert "test2"

This reverts commit 6a8d4a6a07cb0e4fa211740952bb348f082aa6c5.
Revert "test"

This reverts commit d0199066f5b0e82d60923160c5a29101622c894f.
Revert "test"

This reverts commit bbdb4b262e1e44829c1fec1fe43958ca383d6f0f.
Revert "testing something"

This reverts commit 6b3954abf376751f2defef93a0084b3a61b120c3.
Merge branch 'release/release_1.0.3'
testing auto update
stashing
Merge branch 'master' of github.com:pjdicke/pixelflip

Conflicts:
	site/git_update.php
error log
fix for git pull php file.
remove git.txt