regex p values adapted
conflicts solved

Merge branch 'master' of https://github.com/SachaEpskamp/statcheck

Conflicts:
	R/statcheck.R