pre merge
logs sorted
Merge branch 'master' of github.com:OwenRackham/idid_ascience