Merge branch 'master' of http://192.168.0.105:10010/r/heavy-cargo-system-web# Conflicts:# .gitignore# README.md