3rd commit
3rd commit
4th commit

Merge github.com:ykang/EventDetection

Conflicts:
	DESCRIPTION