cleaned up merge backup files
Merge pull request #29 from BorisVerk/master

clean up