Made magic changes
Merge https://github.com/Racer159/adayindeath

Conflicts:
	src/StandUpMeeting.java