laravel
remove composer.lock from gitignore
Merge pull request #1 from zombiesh/master

merge master and develop