Created usable makefile
changed nullptr to 0
Added object generation
Added destructor
Merge branch 'master' of https://github.com/TimQuelch/Dungeon-Crawl

Conflicts:
	Makefile
Fixed bug that caused crash in Objectlist.cpp
Test code