added Nisekoi characters
added Hyouka characters
fix merge conflict
fix merge conflict