Added Alert Dialog Slides to powerpoint
Merge remote-tracking branch 'origin/master'

Conflicts:
	ParkingProject/app/app.iml
	ParkingProject/app/src/main/AndroidManifest.xml