baseunit class added
gitignore updated
merge conflict