more changes to A03, ordering and rubric
Merge branch 'master' of github.com:IntroHCI/website