jim her
change
Merge branch 'master' of github.com:iterate/gitlek

Conflicts:
	deltakere.txt