first edit
Merge branch 'master' of https://github.com/emilyyt/geotext-fontend