index page modified

index page modified
Merge branch 'master' of https://github.com/kent-ma/ece356

Conflicts:
	nbproject/private/private.properties