i want to pull
fixed merge
control page of username and roles
Merge branch 'master' of https://github.com/stanri/kswak
make possible to have teachers yay
Merge branch 'master' of https://github.com/stanri/kswak