authorship
Merge branch 'master' of https://github.com/garnet-charis/lisa-s-repository

Conflicts:
	journal.txt