Rights mess
Merge branch 'master' of github.com:Shedward/timus