More compilation insanity
Merge shenanigans

Conflicts:
	src/main.cpp