First commit
git rid of .bak
merge