haaaaands
Merge branch 'master' into mike

Conflicts:
	Reservation.h
	User.h
trying to fix git
changed things