Added obstacles and agents into a unfied dictionary for collission detection. Previously, we were iterating over only agents since in simulation those were the obstacles. Have not tested out to see if there is any issue with doing this i.e. we assume that obstacles have the same accessors.

Author: SimonKato