Updates services and research

research.mdwn

@@ -28,6 +28,8 @@ Raw list with things to try, research, evaluate develop and maybe deploy!
 * https://github.com/gorhill/uMatrix
 * https://github.com/metabase/metabase
 * https://lede-project.org/start
+* https://github.com/shadowsocks/shadowsocks-go
+* https://botman.io
 
 ## Multimedia
 

services.mdwn

@@ -108,6 +108,7 @@ Social media
 * [Incoma](https://github.com/Incoma/Incoma).
 * [Sneer](https://github.com/klauswuestefeld/sneer).
 * [Noosfero](http://noosfero.org/).
+* [Mastodon](https://mastodon.social).
 * Democracia: [Liquid Democracy](https://wiki.piratenpartei.de/Liquid_Democracy) / [Liquid Feedback](http://liquidfeedback.org).
 * [Briar](http://briar.sourceforge.net).
 * [Twister](http://twister.net.co/).