initial
Merge branch 'master' of https://github.com/Aditive/helloPHP

merge the git stuff with my stuff