Small things
Merge branch 'master' of https://github.com/calledol/project1_avalg14

Conflicts:
	src/pollard/mainPollard.cpp