edited chronology
Merge branch 'master' of https://github.com/cgbann14/writing

Conflicts:
	AristidesChronology