amination update
merge
merge
added gitignore