feature_a2
Merge branch 'feature_a2'
Merge branch 'master' of github.com:Mihailoff/sandbox

Conflicts:
	file.txt