?
Merge branch 'master' of github.com:Korsani/kocrack

Conflicts:
	kocrack