Changes to syllabus
Merge remote-tracking branch 'origin/prep_2012' into prep_2013

Conflicts:
	blog/_posts/2013-06-03-syllabus-671.md
More work on syllabus
Tweak syllabus
Merge remote-tracking branch 'origin/prep_2012' into prep_2013

Conflicts:
	blog/_posts/2013-06-03-syllabus-671.md
Add resources to syllabus