Changed gitignore to ignore themes directory except default theme.
Fixed merging issue due to commit amend. I guess I had pushed it.