Change user.php
Merge remote-tracking branch 'upstream/master'
Update createTable.sql user table and add register.php (untested)