check date/time
Merge branch 'master' of https://github.com/georgekick/aoristicGUI

Conflicts:
	RsubCodes/a4_AoristicAnalysis.R