small changes
no smiley
we don't need no education, we don't need no thought control
Merge branch 'master' of https://github.com/SIS-Team/SIS