SS-2 Checkpoint development of social sampling experiment 1
Merge branch 'master' of https://github.com/kjransom/uoa-ccs-experiments

Conflicts:
	socialsampling-1/web/js/experiment.js