ntf/cuhk-software-engineering-project — pull request #1 by ntf (2014-11-07 19:19:59+00:00)
Title: Finalcode

Merge final code phase branch to master