ignore
kala 1
Merge branch 'master' of https://github.com/kala-gx/Git_Test.git

Conflicts:
	.gitignore