Branch test update

Testing out this branch nonsense. Also explained some stuff to mah main
man Jelle.
Merge pull request #2 from AuditeMarlow/niek

Branch test update