update to plan for week 33/2013
Merge remote-tracking branch 'origin/master'

Conflicts:
	projects/drewag/freitag.html