removed spurious files - will only be on branch 'update' from now on
Merge branch 'master' of https://github.com/PerseusDL/canonical
Merge branch 'master' of https://github.com/scotartt/canonical
First cut of de rebus bellicis
merge fixed
Merge branch 'master' of https://github.com/scotartt/canonical into update
fuck, don't delete this file pls