add hi
Merge remote-tracking branch 'origin/master' into add_hi

Conflicts:
	public_html/index.php
Merge pull request #3 from dsses/add_hi

add hi