delete test file
deleted log
Merge branch 'devel'