some new changes

added nav for weeks and ...
Merge remote-tracking branch 'origin/master'

Conflicts:
	protosite/index.shtml
	protosite/week1.html