this is the new version
Merge branch 'master' of https://github.com/kyllesdk/sw411f13-paper