finished 2
Merge branch 'master' of https://github.com/mks65-dw/signals

Conflicts:
	4/shahruz_ghaemi/signals