差不多写好了，就差上传，主页还有个人
Merge branch 'master' of https://github.com/Dearest/TicketSystem.git

Conflicts:
	bin/AndroidManifest.xml
	gen/com/compitation/ticketsystem/R.java