Added dev cluster with pseduo-dist hadoop
Resolve conflict