added merge notification
Merge branch 'master' of github.com:mchalek/batch_file_proc