turn in lab 2(python), lab 4(python), lab 5(php), lab 7 (php and python)
Merge branch 'master' of https://github.com/tbsmithFS/SSL1304

Conflicts:
	datemple/.DS_Store