Converted from mysqli to PDO
Converted from mysqli to PDO
Converted from mysqli to PDO
Converted from mysqli to PDO
Converted from mysqli to PDO
Converted from mysqli to PDO
User table adjustments
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	tests/UserDBTest.php