Merge branch 'feature_alpha'
bravo, lorem
bravo, lorem, ipsum
Merge branch 'master' of github.com:Mihailoff/sandbox

Conflicts:
	file.txt
master, lorem, ipsum