Aethor a8107a97b1 Merge branch 'master' into 'bro' ... # Conflicts: # Elevator/Elevator.c		2018-06-22 00:00:32 +00:00
..
Resident.c	Merge branch 'master' into 'bro'	2018-06-22 00:00:32 +00:00
Resident.h	du refactor	2018-06-21 16:15:33 +02:00