Added a print statement

(To override Stephen's)
Added Hello World
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php