ace
Merge branch 'master' of https://github.com/alexandruluca/furry-octo-bear

Conflicts:
	file1.txt