Commit
Merge branch 'master' of github.com:theZiz/OPKManager
my repository works

Conflicts:
	OPKManager.c
	ToDo