initial commit
Merge github.com:yparekh39/CatApp

Conflicts:
	.gitignore