integrated amans changes, updated gitignore