Created UserADB Class
Comment ADB Altered. Users Altered. Code altered to use 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
Converted from mysqli to PDO
User table adjustments
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	tests/UserDBTest.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	tests/UserDBTest.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	tests/UserDBTest.php
Loading user data
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	tests/UserDBTest.php

Added SQL for allowing Roles
Merge origin/master

Conflicts:
	SQL/createDB.sql
	csv/loadcsv.php
	csv/mockCSV.csv
	tests/LoadCsvTest.php
Merge origin/master

Conflicts:
	SQL/createDB.sql
	csv/loadcsv.php
	csv/mockCSV.csv
	tests/LoadCsvTest.php
Merge origin/master

Conflicts:
	SQL/createDB.sql
	csv/loadcsv.php
	csv/mockCSV.csv
	tests/LoadCsvTest.php
Merge commit '2e32398e39717f71e54278bbe4a9b1ddf242bce4'

* commit '2e32398e39717f71e54278bbe4a9b1ddf242bce4':
  2e32398e39717f71e54278bbe4a9b1ddf242bce4
  Merge origin/master
  Merge origin/master
  Merge remote-tracking branch 'origin/master'
  Loading user data
  Merge remote-tracking branch 'origin/master'
  Merge remote-tracking branch 'origin/master'
  User table adjustments
  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
  Comment ADB Altered. Users Altered. Code altered to use PDO.
  Created UserADB Class

Conflicts:
	.gitignore
	SQL/createDB.sql
	csv/loadcsv.php
	db/CommentADB.php
	db/DB.php
	dbobjects/User.php
	tests/LoadCsvTest.php
	tests/UserDBTest.php