gitignore updated
pulled master