Trying to sync the branch

sync
sync2

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

Conflicts:
	bmcomber.css
	nbproject/private/private.properties
	nbproject/project.properties
	nbproject/project.xml
sync3

sync3