Changed parameters in notes
Merge branch 'master' of https://github.com/WLPhoenix/my-c

Conflicts:
	src/my.c

obligatory commit message
Merge branch 'master' of https://github.com/WLPhoenix/my-c

merging my edits AW
inserted suggested changes