Doc tags and stuff
Merge branch 'master' of https://github.com/Timmay24/SE1