version 3.+?
.gitignore changed from thwang.

I have changed the .gitignore file, .class, .jar, .war and so on will
be ignored!
Merge branch 'pr/2'

Conflicts:
	thwang.txt