All my files
Merge branch 'master' of https://github.com/kalyand14/TestApplication

Conflicts:
	.gitignore