Ignore .iml files
Merge pull request #269 from cs2103aug2014-w13-1c/ryan/controller

Fixed bug with priority parsing
Update README
Merge pull request #270 from cs2103aug2014-w13-1c/jin/gui

Nicer README
Merge branch 'staging' into ryan/controller