merging
Merge branch 'master' of github.com:pannellr/wiki_class_notes

Conflicts:
	models/DB.php