tin2
Merge branch 'master' of https://github.com/cs1384/WSE_homework2

Conflicts:
	conf/engine.conf
	data/wiki
OccuranceIndex done