codesniffer changes
updated composer
moved composer.lock to gitignore
updated composer.lock
Merge branch 'master' of https://github.com/winkbrace/winkform

Conflicts:
	composer.lock