Merge branch 'master' of https://github.com/joschi127/phpcr_benchmark

Conflicts:
	index.php
fixed previous commit .. remember to run tests locally before pushing :)
Merge remote-tracking branch 'lsmith/master'

Conflicts:
	index.php