removed composer.lock from git.ignore
Merge pull request #1 from worldmentr/j-garcia-0788

removed composer.lock from git.ignore
Merge branch 'master' of github.com:worldmentr/capstone into dbecker215

Conflicts:
	composer.lock