My commits
mycommit
commit2
Merge branch 'master' of https://github.com/bjeziorek/Defender-master

Conflicts:
	Defender-master/kosmita.lua