Merge pull request #272 from cs2103aug2014-w13-1c/ryan/controller

Fixed bug with capital letters
Add back .idea/
Merge branch 'staging' of github.com:cs2103aug2014-w13-1c/main into staging
Merge branch 'staging' into ryan/controller