130522lab
Merge branch 'master' of github.com:saki45/OJ

Conflicts:
	ZOJ/makefile