Gotten rid of bootstrap.php we van use vendor/autoload.pph instead
Merge remote-tracking branch 'origin/master'