local merge
Merge branch 'experimental' of https://github.com/eniltonj/lolypop into experimental

Conflicts:
	file3.txt