updated by ashley 5:45 PM Tuesday, 22 Jan, 2013

updated by ashley 5:45 PM Tuesday, 22 Jan, 2013
Merge pull request #1 from AshleyDeng/master

2