ac: aoj/1330, poj/2236
commit
Merge branch 'master' of github.com:solorab/competition

Conflicts:
	kyop
ac poj 3262
work in progress