resolved
Merge branch 'master' of https://github.com/foqa-test/trial_repo

Conflicts:
	test_addition.md
plus
af