forgot to commit this
merged and updated gitignore