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
Added functionality to manage roles by an admin
Updated create DB.sql to use integer characters for role instead of alphabet characters
Updated the pages/files affected by the role change
Added function to allow the csv file to be loaded into the database
no message
Merge branch 'master' of https://github.com/kiwi-ET/Feedback

Conflicts:
	dbobjects/User.php
Added module table
Added teaching_module table
no message
Updated test to correspond to the updated class
Localhost setup
no message
Merge branch 'localAK' of https://github.com/kiwi-ET/Feedback
Merge branch 'master' of https://github.com/kiwi-ET/Feedback

Conflicts:
	SQL/createDB.sql