Update files

Updated files to the latest version of code
Merge remote-tracking branch 'origin/master'

Conflicts:
	eecs_647.php
	functions.php