I hate mySQL
Errybody got things working
Merge remote-tracking branch 'origin/master'