Testing fork/pull
Merge pull request #20 from cs2103aug2014-t13-1c/Emman's-branch

Testing fork/pull