indentation guide
Merge pull request #1759 from diegosarmentero/master

indentation guide