Git Ignore Modifications
Merge branch 'master' of github.com:pidal233/dialerApp-group1

Conflicts:
	.idea/misc.xml
	app/app.iml