Merge pull request #1 from cybergibbons/master

Test for Ed
Delete