Master branch now merged with testing
Delete test
Master merged
Testing merged with Master Version 1.0
Delete CHANGELOG
this is on Tina's comp
with scripts
just work