some unnoticed changes
Merge branch 'master' of https://github.com/AhmedRefaat/Conference