Merge pull request #8 from leesdolphin/master

Fixed Segmentation Faults
Fixed faces not being counted
Merge branch 'master' of https://github.com/coldAmphibian/DotL

Conflicts:
	utilities/LoL map converter/main.cpp
Fixed git breaking code again