some edit
Merge branch 'develop' of https://github.com/tranzero/SoftServe_Java-105_Project.git into develop