added geany editor
Update authors.md
Fixed merge conflicts