test
test2
test
TE
o
KK
Merge branch 'master' of github.com:nts2201/my-projects

Conflicts:
	.gitignore