cuvant
mm
Merge branch 'master' of https://github.com/keisec/YADC

Conflicts:
	main.c
Merge branch 'master' of https://github.com/keisec/YADC