.gitignore
Merge branch 'master' of github.com:kiwiyuki/COJTproject

Conflicts:
	.gitignore