trying to cause a conflict
Merge branch 'master' of https://github.com/ranamen/polypred

Conflicts:
	main.cpp
fixing conflict