First Example
Merge remote-tracking branch 'origin/master'

Conflicts:
	example/spyglass/www/index.php