line1
Merge branch 'master' of github.com:yas-alhamdani/version-control
cahnging commits
Conflicts:
	my_plans