Merge branch 'master' of http://github.com/xmduhan/ticketpitcher into HEAD

Conflicts:
	pitcher.py
	test.py
增加查看预订信息、取消预订、刷新预订功能
Merge branch 'dev'

Conflicts:
	.gitignore
	pitcher.py
	test.py