messages corrected
resolving conflicts
Merge branch 'master' of github.com:usmanasif/eduleaf_test