started writing help then had to go to class
Merge branch 'testing' of https://github.com/CPSC491FileMaker/project into testing