update
Merge branch 'master' of https://github.com/samindaa/csc_688_2014_doc