Removed composer.lock

Added it to .gitignore
Merge branch 'dev/issue1'

* dev/issue1:
  Removed composer.lock

Conflicts:
	composer.lock