created a new file
¨created a new test
added my name
added my name
Merge branch 'master' of https://github.com/iterate/gitlek

Conflicts:
	deltakere.txt
added my name
fixed
changed