removed copied file from root dir
messaging!
Merge branch 'dev'