added scaled image in blank spot of frame as place holder.
updated the root directory with noahs contributions and removed his testing directory
removed test in root
Delete .nfs000000000033c5ea00000ea0
Delete .pycalendar.py.swp
deleted Noahs dir in favor of actual testing branch
Merge branch 'master' of https://github.com/CPSC491FileMaker/project
bring testing inline with master
updated testing.
added cleanup on exit.
added contact stub; add universal clean function on exit
added contact stub; add universal clean function on exit
colors and employees
color and employees
Delete test
Delete .nfs000000000033c5ea00000ea0
Delete .pycalendar.py.swp
Merge branch 'testing' of https://github.com/CPSC491FileMaker/project into testing

Conflicts:
	testing/Noah/out.txt
	testing/Noah/pycalendar.py
Merge branch 'testing' of https://github.com/CPSC491FileMaker/project into testing
oops