I broke everything.
Merge branch 'master' of https://github.com/Seist/Skylight

Conflicts:
	Skylight/bin/Debug/Skylight.dll