Added composer lock to ignor list
Merge branch 'master' of https://github.com/jibaomansaray/AlicePHP

Conflicts:
	.gitignore
	Framework/Alicephp/composer.lock