Update elixir-users.geojson

Add couchemar as user
Fix conflicts
Merge branch 'couchemar-master'