Deleted unused files, added triviacr info.
Merge branch 'dev'