Aethor a8107a97b1 Merge branch 'master' into 'bro' ... # Conflicts: # Elevator/Elevator.c		2018-06-22 00:00:32 +00:00
..
Building.c	Merge branch 'master' into 'bro'	2018-06-22 00:00:32 +00:00
Building.h	Added useful functions for elevator IA	2018-06-21 17:39:30 +02:00