everything's kinda working
Merge branch 'master' of https://github.com/fredseadroid/se.git