my commit working
Merge branch 'master' of https://github.com/DavidJunction/testgit into working

# By DavidJunction
# Via DavidJunction (3) and David Turner (1)
* 'master' of https://github.com/DavidJunction/testgit:
  Update poop.php

Conflicts:
	poop.php
fixed conflict