粗略翻译完了，ideasinnovation中的那篇，写了再说
Merge remote-tracking branch 'origin/zhangzhen'
because I don't know what happened on branch "origin/zhangzhen"
Merge branch 'master' of https://github.com/zwz/Open-Advice_Chinese-Edition
I have to work on the zwz's master
我已经搞不清楚了。
检查了一遍翻译内容，做了些语序和词的调整。
添加了FLOSS的解释
Merge pull request #19 from zarzen/master

翻译了Armijn Hemel的那篇