merge

merge
add gitignore

add gitignore
Merge branch 'master' of https://github.com/PrincessHong/may

Conflicts:
	.gitignore
	KINGMAY/src/com/kingmay/usercontrol/control/ShowControlAction.java
	KINGMAY/src/com/kingmay/usercontrol/control/ShowMarkCountAction.java