Updated gitignore
merged master with updated gitignore