commit för säkerhet, ignorera editor
Merge branch 'Fimbul-Prototype' of https://github.com/TheAtomicGnome/Fimbul into Fimbul-Prototype

Conflicts:
	Fimbul/Fimbul/Fimbul.vcxproj.filters