blabla
Merge remote-tracking branch 'upstream/master'

Conflicts:
	VideoRental.pro.user
adasd
Merge remote-tracking branch 'upstream/master'

Conflicts:
	VideoRental.pro.user
	VideoRental.pro.user.1f86831
Updated menu