simulating conflict.
Merge pull request #10 from Vivek-Tomar/git-conflict-A

simulating conflict.
Merge branch 'Automated_Test_Reporting' into simulating-conflict-B

Conflicts:
	XBlockr/src/com/xblockr/ui/HomeActivity.java