Commiting files locally
Merge branch 'master' of https://github.com/mahtabgodara/project1

Conflicts:
	README.md
Merge branch 'master' of https://github.com/mahtabgodara/project1