commit master
Merge branch 'master' of github.com:xli619/Dispatcher

Conflicts:
	.gitignore