Changed link classnames + rel links
Fixed file conflicts after improving language
Merge branch 'master' of https://github.com/Webster2014/How-to-choose-your-OS