Deleted file.
Merge branch 'master' of https://github.com/tallabs/test_rep

Conflicts:
	SharedData.java