Updated .gitignore
Merge branch 'staging' into ryan/controller
Merge pull request #265 from cs2103aug2014-w13-1c/ryan/controller

Edited .gitignore