Fixed GitHub Conflict

Fixed two skilljoy.sql into one, ensuring that user table also has
username column