resized
Merge branch 'cpp11' of devlaeminck.bio.uci.edu:~/git/fwdpp into cpp11