rm directory
Merge branch 'master' of https://github.com/lostsakya/GitTest

Conflicts:
	octocat.txt