Changes to chatty

	merge conflict upcomming
	Reviewed by: Simon
Delete feature merged into program

Conflicts:
	src/dataSource/Chatty.java
	Reviewed by: Simon