BUNCH O STUFF
Merge branch 'master' of https://github.com/gemarcano/HotBodies
changes
Conflicts:
	src/DoubleTextParser.cpp