stuff
did a thing
it's because git is a dick
Merge remote-tracking branch 'origin/Tom' into mike

Conflicts:
	Date_Time.h
	ReservationList.h
	a.out
	airport.cpp
bringing back to master
fixed addMinutes maybe
shut up git
Merge branch 'Tom' into mike

Conflicts:
	Date_Time.h
Merge branch 'Tom' into mike

Conflicts:
	User.h
	a.out
dude, I have no idea what I did
Merge remote-tracking branch 'origin/master' into mike

Conflicts:
	User.h
	a.out
Merge remote-tracking branch 'origin/Tom' into mike

Conflicts:
	a.out
added comments
Merge remote-tracking branch 'origin/Seth' into mike

Conflicts:
	User.h
	a.out
Merge with Seth
Merge remote-tracking branch 'origin/master' into mike

Conflicts:
	a.out
Commented and cleaned up files