Merge branch 'master' of https://github.com/N3U2O/algos

Conflicts:
	p2/build/ba.sh
	p2/build/bin/input.dat
	p2/src/conv.cpp
Merge branch 'master' of https://github.com/N3U2O/algos