nefore merge
Merge branch 'wikirosalab' of github.com:belonesox/configs into wikirosalab