Added all extra files
Update .gitignore
Fuck this shit
Merge remote-tracking branch 'origin/master'

Conflicts:
	DnD/DnD.sdf
	DnD/DnD/Map.h
Merge branch 'master' of github.com:alanly/comp345-dnd into Alan