php testing
Merge branch 'master' of https://github.com/arkzero/IT332Project into php_testing
prettier php