bugs fixes
Merge branch 'master' of https://github.com/osei95/P2016-E15-PHP