reorganising
Merge branch 'master' of https://github.com/myopicmage/mirrormirror