Hi Aaron
newlab3 and more
Merge branch 'cracMonkey' of https://github.com/MS50group3/MADLAB into cracMonkey

Conflicts:
	sources_and_horses/world/init.h
	sources_and_horses/world/map.c