Merge branch 'master' of https://github.com/cs2103aug2014-w10-4j/main

Conflicts:
resources/client_secrets.json
src/chirptask/logic/InputParser.java
Resolve conflicts