added a line
Merge branch 'dev'
Switched from mysql library to mysqli
Merge branch 'dev'