most recient noah copy
Merge branch 'testing' of https://github.com/CPSC491FileMaker/project into testing
added remove employee
Merge branch 'testing' of https://github.com/CPSC491FileMaker/project into testing
Merge branch 'testing' of https://github.com/CPSC491FileMaker/project into testing

Conflicts:
	testing/calendar_nowstretches.py