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

Edited .gitignore
Merge pull request #266 from cs2103aug2014-w13-1c/ryan/controller

Fixed bug on return message for sort
comment for inputfieldviewmanager
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui
Ignore .idea file
Merge pull request #267 from cs2103aug2014-w13-1c/jin/gui

Ignore .idea config folder
Removed extraneous files from root directory
Merge pull request #268 from cs2103aug2014-w13-1c/jin/gui

Removed extraneous files from root directory
Merge branch 'staging' into ryan/controller