Merge pull request #252 from cs2103aug2014-w13-1c/jin/gui

Mooooore comments!
Ignore docs folder
Merge branch 'staging' of github.com:cs2103aug2014-w13-1c/main into jin/gui