committing my hello.php
Merge branch 'master' of https://github.com/taufinaiden/testing

Conflicts:
	hello.php

Merged hello.php