created Control file
Merge branch 'alan'

Conflicts:
	TypeDash/.classpath
	TypeDash/bin/classes/ru/hack/typedash/TypeDash.class
	TypeDash/bin/jarlist.cache
	TypeDash/src/ru/hack/typedash/TypeDash.java