I think it works!
Working on database class
Working on database class
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/classes/bootstrap.php
Working on database class