db1
addagain
Merge branch 'master' of https://github.com/pannellr/wiki_class_notes

Conflicts:
	models/DB.php