fixed conflict on project material (dat vs. data)
changed dat for data in instructor material for project lesson
merged conflicts with knitr material
Merge branch 'gh-pages' of github.com:nicercode/2014-02-13-UNSW into gh-pages