suo file
web.config
Merge branch 'master' of https://github.com/akhilrex/DMP_New

Conflicts:
	.gitignore
pulled
menus and total