licence
Merge branch 'testing'

Made some mistakes ;)