Merge branch 'designchange' of https://github.com/mayankasthana/Todo-Server into designchange

Conflicts:
	.gitignore
Merge branch 'designchange' of https://github.com/mayankasthana/Todo-Server into designchange

Conflicts:
	.gitignore