This is what I wanted to commit
Merge branch 'master' of https://github.com/beavis28/Sandbag

Conflicts:
	test.txt