Finished commenting for my part! Yay!
Merge pull request #263 from cs2103aug2014-w13-1c/ryan/controller

Finished commenting for my part! Yay!