Finished it... =P
Merge branch 'master' of https://github.com/yinwei-zhang/tamu-cs