Merge branch 'master' of github.com:ferdikoomen/openapi-typescript-codegen

# Conflicts:
#	package-lock.json
#	package.json

Author: ferdikoomen