Merge branch 'master' of https://github.com/dimonn12/MyWalletApp.git
Merge branch 'master' of https://github.com/dimonn12/MyWalletApp.git
Merge branch 'master' of https://github.com/dimonn12/MyWalletApp.git

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/dimonn12/MyWalletApp

Conflicts:
	.gitignore