changes
Merge branch 'master' of github.com:ajutscaria/CS224U

Conflicts:
	NLPCodeBase/process_extract.jar
formatting of code
Merge branch 'master' of github.com:ajutscaria/CS224U
set timeout