Renaming
2.2 version
Conflict resolved?
Renaming
Merge branch 'master' of https://github.com/kipid/docuK

Conflicts:
	docuK All in one.html