Pre merge
Merge conflict
Merge branch 'master' of https://github.com/stefanledin/Algatipset

Conflicts:
	vendor/composer/installed.json