A whole bunch of stuff
Fix merge conflict + put back getName() HAHAHAHAHA
Merge branch 'develop' of github.com:luukholleman/ASRSJava into develop