added gitignore
merge fix
author fix