Add back .idea/
Merge branch 'staging' of github.com:cs2103aug2014-w13-1c/main into staging