my name

add asik o
fixing merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	See me please.txt
Merge branch 'master' of https://github.com/CBischke/WKOProject

Conflicts:
	See me please.txt