commit

commit
Merge branch 'master' of https://github.com/Assignment4/CourseSite

Conflicts:
	index.php
	nbproject/project.properties
	nbproject/project.xml