got rid of AMMAR CONFIRM comments. ready to merge.
Merge pull request #1 from hukevinxiaochen/master

Kristen Ng Updates