First test for cherry picking
Second test for cherry picking
Update testing.php
Merge commit '982ea3a' into staging

Conflicts:
	index.php
Merge branch 'staging' of https://github.com/contrapublic/try_git into staging
Update index.php
Update index.php
further edits
more updates
Update index.php
Update index.php
A couple of files edited.
Merge commit '3cc788b'

Conflicts:
	index.php