Merge pull request #9 from Vivek-Tomar/XBlockr1.0

X blockr1.0
simulating-conflict-B
Merge pull request #11 from Vivek-Tomar/simulating-conflict-B

Simulating conflict b
Changes