Auto complete hashtags
Merge branch 'master' of https://github.com/cs2102aug2014-w11-3j/Pact

Conflicts:
	Pact.jar
	bin/cli/CommandLineInterface.class
	data.txt