Fixed conflicts
Merge branch 'master' of https://github.com/cs2103aug2014-t7-2/main

Conflicts:
	dataManipulation/Command.java
	dataManipulation/Subcommand.java