Cleaned up the project data files
modified editInfo from iss53 branch
Hotfix feature added from the hotfix branch
Modified editInfo from iss53 branch
Merged iss53 into master after resolving conflict
newFeaute added from new-feautre branch
Hotfix added from hotfix branch
Merge branch 'master' into new-feautre
hotfix page modified from hotfix branch
another new development from new-feature branch
edited temp file as greets user