a
Merge branch 'master' of https://github.com/JetAlone/ERP
Add vendor
Merge branch 'master' into php/application
Merge branch 'master' into php/application
Merge pull request #144 from JetAlone/php/application

Php/application
Merge branch 'master' of https://github.com/JetAlone/ERP
Update ignore
Update composer
Merge pull request #145 from JetAlone/php/public

Php/public
Update database connection