Changelog for week10 20131111
Merge remote-tracking branch 'origin/week10'