Fixed conflict.
Merge branch 'master' of https://github.com/gracaninja/lxmls_guide